This reverts commit a874df5865 and follow on fix 9674e1d442. Change-Id: I6bcc4ca9025cd26f2c9c7bb5dce8e6dcf09db485
a874df5865
9674e1d442