Revert fe98a62d279e24ae9409f18e28e3e4aae907a04f - this introduced serious performance regression