This reverts commit 0a99d457 because it should go into only 10.5+
Attach a file by drag & drop or click to upload