Reverted r111186, r111226: broken per CR