Bug 1045644 - Preserve scope when calling make.create/update/delete