Revert "Merge branch 'master' of https://github.com/joomla/joomla-cms"

This reverts commit eccdb434f99eb7949336bb30725801e4366d4dda, reversing
changes made to f96fd77b1becdf9daf85478e00eee01dbb6205bd.