Revert "add-bottom-collapse (WIP)"

This reverts commit e2e6408f39ee6d86c3c4f3e42755641d4fe7ea1f.