This is a soft revert. This reverts commit 37df2dba Change-Id: I7ac08c0ef514f7ce7a0b750e501a5333f4ffb6d2