Reverts PR #11115. The original change was mistakingly reverted instead of #10822
Attach a file by drag & drop or click to upload
