Revert "Panel Containment Refactoring"

This reverts 0d133cf0

As discussed before, we can't find the root causes of many bugs, and @niccolove prefers a complete revert rather than a partial revert.

See also: !959 (closed)