Reverted previous hopper changes.