Revert "WIP Add option for 'restrictHierarchyToTypes'"

This commit belongs on a different branch (restrictHierarhcyToTypes)

This reverts commit 9692ff91aa973247bbc251c44285783b6ecc4a44.