r17992: reverted r17842