Revert "Fixed a small problem with cyclical references in hardware object xml files."

This reverts commit 64dce94cafab9dbb5bc50d287dab6d5403ef1f98.