They were always allocated together and had a one-to-one relationship, so let's just make them one thing.
Attach a file by drag & drop or click to upload
