Revert old hacks, run api through main router
This will avoid future issues as now we know it is through one system, and this allows minimal changes to the existing api