Revert e380093..bd81ec0

This rolls back to commit e38009374aa7c5f3c895835ff4662c40d5fb64cb.