This reverts commit 9e7f0677. Due to unit test breakage. Change-Id: I664c25c17fc4cc98264bdac772eac086c9fbc183