Rollback of the speed up code was removed by accident.