Apply missing changes from f92a41f7 Also remove unused variable
Attach a file by drag & drop or click to upload
