This reverts commit cdcaa37a. Due to unit test breakage. Change-Id: I1c22edf983f6e03a34b86d7c1fae3d3188447a75