revert Make.defaults to upstream version and move my changes to a patch