[ticket/11224] Revert "Merge pull request #2460 from Nicofuma/ticket/11224"

This reverts commit d26436944173d1fa28a1abd96bca861381246860, reversing
changes made to 75fcfb1c1d68f1632e7beae3f59699ddff8e5292.

PHPBB3-11224