Revert r101492, broken, see CR. Also revert followup r101496.