Revert 534c4e8..d1f6a68

This rolls back to commit 534c4e80de3c95d996042a3c8136721c33e14101.