Revert 629556d..9205360

This rolls back to commit 629556d6eac87e558ea59e657b1fbd5155659f8e.