And let's stick with the one that returns the data pointer.

Change-Id: I931be0d73adcf6f3888d05ef58bc0f905f5a6958