fix a regression and an accidental revert.