This reverts commit 04ea0535. It has to be redone with proper test coverage.
Attach a file by drag & drop or click to upload
