I wonder what is the right solution, @isratrade is working on nesting support for taxonomies at #1105 which would obsolete this fix (as then we must of disabled orgs because of inheritance).