Undid changes that caused problem with enterprise api