fdo#72727: Revert "fdo#68663 don't blindly force categories when there are none"

This reverts commit b090cbdf82e0827234caf5969124f6631311ef35.
(cherry picked from commit 91ca3a92c54a08ad13497d7e8ac1916e7b68bbfd)