Revert 179826. Tests were worthless.