Ticket/13234

Replaces https://github.com/phpbb/phpbb/pull/3088
undo please