Followup to commit 97dfa0d5 which had the side effect to break some attribute unit tests
Attach a file by drag & drop or click to upload
