This reverts commit 67066bf6 and 1a2780cb as there are still some upstream issues to resolve.
Attach a file by drag & drop or click to upload
