Revert "Updates for CollectionView support."

This reverts commit a281090e9dbf854ab289c1c2b46975ea15213502.
remerge.
Recommit collection view updates.