Revert "Merge branch 'org_hierarchy' into merge"

This reverts commit 21db0e7f35909bfa48f915e8ffb213fc91ccb993, reversing
changes made to a77c2cac0c18c41488429166c23b5da64e6d2fc7.