87354cb640
This removes the need for a patch that was used before, and removes the dependency on the m2r package which is broken