This reverts commit cef0725c215215f164a931cf1218ddd337ba08fc. Change-Id: I77c4ef70f2b55c1d6b0aaad5653746a21a5b11ac