am 793810f6: am 23aa34a7: Merge change I137dac6f into eclair

Merge commit '793810f68fcf1ace817f6ebcb42a6adb13c28582' into eclair-mr2-plus-aosp

* commit '793810f68fcf1ace817f6ebcb42a6adb13c28582':
  backout a workaround that is not needed anymore