Revert r44978 -- breaks back-compat