Applied my hopper performance fix from the 1.7.2 branch