Reviewed-by: alanb, sherman, ahgross, jeff

Summary: Backed out changeset 7316b3f30654
Reviewed-by: coffeys

Reviewed-by: jeff

Reviewed-by: dfuchs

Reviewed-by: sherman, jeff