revert changes from r 96616