Workaround for GH-336
Our improved hopper checking system should provide a better benefit without as many vanilla behavior issues.