This reverts commit c64583b6 due to multiple buildbot failures when building it.
Attach a file by drag & drop or click to upload
