Revert 1f65cd0..c4d9d84

This rolls back to commit 1f65cd0ac02421b97c6c4e5aa74f0fc2e1ccb952.