Dev

Get a patch file to get rid of those two commits by Arthur.