Rverting r37705, and r37706.