Undoing make API on by default for now. This needs to be done in the db