Rebuild instead of patching by hand