Revert d7451a3..70efc08

This rolls back to commit d7451a366c08e7c7d54173f211eee6b994e7bab0.