Revert fix since it caused mtr tests to not run in pushbuild.
Attach a file by drag & drop or click to upload
