This reverts commit a978ab4526. Reason for revert: fix test Change-Id: Id6b49106ab7d8a42ea5de8b16a0dd3ed49d58817
a978ab4526