Undoing make API on by default for now. This needs to be done in the db
Merge branch '2.5.x' into saas