This reverts commit 6798f157. Reason for revert: 127996235 Fixes: 127996235 Change-Id: I51b2afa558fe71cb64e12e37e36132f3e0190c5d