Revert 8a04bb8..0122d56

This rolls back to commit 8a04bb8b3de29b8450d125e1931421498f84adf8.