Revert "better expand collapse"

This reverts commit b71a8d17177b8927fa7e1f86ec4216f5efd157e9.