reverted changes from r11473