diff --git a/library/psa_crypto_slot_management.c b/library/psa_crypto_slot_management.c
index ea3a5fc..5428b43 100644
--- a/library/psa_crypto_slot_management.c
+++ b/library/psa_crypto_slot_management.c
@@ -321,14 +321,8 @@
     if( status != PSA_SUCCESS )
         goto exit;
 
-    /* Copy core attributes into the slot on success.
-     * Use static allocations to make the compiler yell at us should one
-     * of the two structures change type. */
-    psa_core_key_attributes_t* builtin_key_core_attributes = &attributes.core;
-    psa_core_key_attributes_t* slot_core_attributes = &slot->attr;
-    memcpy( slot_core_attributes,
-            builtin_key_core_attributes,
-            sizeof( psa_core_key_attributes_t ) );
+    /* Copy core attributes into the slot on success */
+    slot->attr = attributes.core;
 
 exit:
     mbedtls_free( key_buffer );