This reverts commit f17300e7. Reason for revert: <Caused test failures> Change-Id: Id199e36e189c586c92f994023f60f64be9f5f443