Revert b70a5ae..5343625

This rolls back to commit b70a5ae7234f1c52910eb65a23576a79a48fcd06.