Revert "containment window"

This reverts commit 634df42371014ad9c5502ea36f87c79442a81465.