This reverts commit d4d6167f. Bug: 36206160 Test: Fugu compiles, didn't before the revert Change-Id: I2b0d3a05546ee2605555a9aa7ae028f2baeaf439