Apply Bart Selders' patch and remove leftover file