This reverts commit e68d671a51. Reason for revert: a regression Change-Id: I78180ba011f45af9a4cce110b14f379aa10f7d3a
e68d671a51