This reverts commit d2dd3793. Reason for revert: Breaks vm-tests. Bug: 119949783 Bug: 113373927 Change-Id: I2b23285ba98422a23da653d7ea99d9034000f6d6