This reverts commits 4de60244 and b2d69806. Further thought is required to make this work properly.
Attach a file by drag & drop or click to upload