This reverts commit d264369441, reversing changes made to 75fcfb1c1d. PHPBB3-11224
d264369441
75fcfb1c1d