This reverts commit d9d985be. Reason for revert: API no longer needed Change-Id: Ibc906ccf696dacf4790e319e598b26e068cd128f