Reverted changes to AbstractApp. Was being stupid...