Regression: Reverting #4104

 See https://github.com/joomla/joomla-cms/issues/4376