This reverts commit 70d9fb63e6. Reason for revert: Outstanding usage of this method removed internally Change-Id: Idcc00ec261aa1d97f11e47abdb08b10a37b5d20f Test: Local build; treehugger (which I'll manually confirm runs on the appropriate targets)
70d9fb63e6