Revert "Fix for: Unable to import root categories."

This reverts commit bffc0364e9359ec9ad2ba9867c554f3f0dd4cbd4.
Revert "Revert "Fix for: Unable to import root categories.""

This reverts commit e1d58d2e9eaa58802be2cabd95e68361a008d9ce.