Adding back the default api handler I broke

Change-Id: I4adcf8477ef5188ac70c47e3223eb210c8e3be83