Revert b9daeec..594ee6c

This rolls back to commit b9daeec66bff46a892a104585f2955799ce49314.
CollectionView Update!