Revert the kludge in 76703. I got a clean