Remove collapsibility.

Fixed #715, #716