Merge "Remove obsolete workaround."
am: f448371208

Change-Id: I2bd057c12b9915b9e45b206b9839d1a57b296f26