Back our r274750 until discussions on proper fix are over.