Revert "EMV2 now handles being inside PropertySet"

This reverts commit 4c4dd7526f76105555b42c63c98e569d1ea0c960.