Partial revert of r80772.