Reverted to 3.10.25+