[ticket/11413] Remove changes for ticket 11420 from this branch

PHPBB3-11413