This reverts commit feb0756d. Reason for revert: redundant now Change-Id: I6cd43f03a28d03a87d19510a554e3bbe0e69b1de