Revert 4990824..431f941

This rolls back to commit 49908249febd619493ac4962daf7db0030a975b3.