This reverts commit f497fa2a. Change-Id: I87794e484a3bf51bec3a8c1b80d70b28b84d2887
mentioned in commit b50933ce