This reverts commit 57affbf91d. Reason for revert: new API is no longer used Change-Id: I97128c1d367e161aa50deaefa8b73a0f25e29af4
57affbf91d