This reverts commit adf75e31f52a7a935a66a884fb55631c7309ee75. Change-Id: I8391eb57c3a53e686bd817d27860fa6f785113f1