Matches hardware behavior and eliminates some nasty behavior we were doing that wasn't hw-accurate at all.