Revert to old update method as findOrCreate() is not behaving as expected for #215