Revert "Merge pull request #352 from rawrjustin/nsorderedset-deserialization"

This reverts commit b1d3eac764e9eae8830cd2cf6c2622f7194b3eda, reversing
changes made to c6a4f0b06ca6c46f0275abaa86973e3f96faa8ef.