Oops, only one rules.mk patch in here please