fix build error
Reverting the new API changes to get the API reviewed