Re-lock down the versions and un-include PSTCollectionView