Revert back to old method for categories