fixing per comments at r70517