This reverts #4713. The implementation in that PR is not accurate. It does not reflect the behavior seen in hardware.