Revert r66004 for now; it's causing a variety of test failures.