And remove unneeded patch + simplify target for speed-up
Attach a file by drag & drop or click to upload
