Revert r89013 and add better tests.