This reverts commit ddcb5001.

This commit itself is good. But some more work is needed to
check failures that were hidden