Temporarily backing out commit bd474799bf95f4ecdc47a7577750eaf69e2236d4.