This reverts commit 4f809fe7. Reason for revert: fix build breakage Change-Id: I75a54189f96fc21f6cb12dd8a05e513b1bda027c