This reverts commit 3e857ec5. Reason for revert: Breaks wm-presubmit Change-Id: I03fbbb01c8cabd0ebb9193adf640b9f07ce19826