Revert 9a82fc5..3d7489a

This rolls back to commit 9a82fc5cab1f64d172ac7934f7b52714e9251b94.