Revert r104659 and its followup r104665: break the unit tests with a fatal error...