Ticket/revert/10917 Revert for now

http://tracker.phpbb.com/browse/PHPBB3-10917