Revert "FL-482: change categories handle, patch by Arfrever"

This reverts commit c515f0b2715bbd8362e892d6473040c297d82c2f.