This reverts commit 66f71f3b. This causes regressions with RDT.
Attach a file by drag & drop or click to upload
