This reverts commit 79201b16. Reason for revert: breaks wm-presubmit Change-Id: I3245e202f88b16d30b924e229cbc05fca37a3759