Revert 1475dec..357a5b7

This rolls back to commit 1475dec268bd3225ddee779854dceca700c7bea3.