[ticket/12332] Restore some changes back to original state

PHPBB3-12332