revert unintended change in r9695