Revert "containment"

This reverts commit 0e3bf0374f524ad124590ef2f70eebe956a37696.