Backout accidental checkin of 8ec5026ae029 and 10d84351ea05