revert r99719 which is breaking the botz.