This reverts commit 7a31b44227. Reason for revert: relanding Change-Id: I3a5758c83ce979f591042488f58fb2bacdf9aa23
7a31b44227