Remove the previous fix and fix it the way we did it in PHPBB3-10360 for 3.1 PHPBB3-6632 PHPBB3-10485