Revert unjustified changes to hopper behaviour.