[ticket/12413-ascraeus] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0 in olympus

Olympus: #2341

https://tracker.phpbb.com/browse/PHPBB3-12413