Follow up to r114081; address krinkles comment