Regression: Reverting #4104

 See https://github.com/joomla/joomla-cms/issues/4376
Leave this part in. Just revert the part in the model as that's what breaks for people.