Revert e19c6b2..4daba07

This rolls back to commit e19c6b2dcfec52555fe55c755ede009ad12a4c37.