This reverts commit b473061c5a. Reason for revert: new API is no longer used Change-Id: I2c4f9f37736faeb5d0403c2ba531c792d2531505
b473061c5a