Revert some of the NSCoding implementation for now