Reverted collections controller to fix crash