revert

Closes-Bug: #1271373

Change-Id: I6f2a2b6e9aae0e4eac1995518c9e2479c194be68