Revert 834cfc4..2751366

This rolls back to commit 834cfc49e558f9a12cbbe1b69c40c69c32ebe3df.