Revert back to pre hierarchical changes