This is effectively a revert of a769fd1e
and a1be31fd which unfortunately caused
regression in complex category placements.

This unfortunately re-introduces fdo#44832. We need to re-think how to
fix that one without breaking the multi-level category feature.

Change-Id: I1ed8364a46174ac6c29aa0b027a33f84bcca51fa