Revert previous change in CRM/Core/Controller.php

This had some strange, totally unexplained side-effects, so reverting until there is an in-depth investigation & testing.