Revert all changes in the AppController: the use-packages branch already has all the fixes.