Revert "r0343010"

This reverts commit 4f2f75031431f6d2ba1a398e9cd0a3489983793e.