This reverts commit 8106bd0b. Reason for revert: Fix CI breakage Change-Id: I5f0e72988cbb6845628d0ec7e82292c0aa1914a7