Revert "Remove old dependencies"

This reverts commit 6a80e376395ddab4d7760cd84d7ed2955b453684.
Revert "Restore views for users - let's redo this since they're working now"

This reverts commit 8d42150b34e0fa151bcda9860ca3e36add7b7c4b.
Revert "Merge branch 'refs/heads/3.0/develop' into 3.0/ui"

This reverts commit 01336f0409ea692d4125bdda12533b860b17b38e, reversing
changes made to 31b0ff0018b4a623dea1c39a9fdffcaf69c42eb0.