another attempt to use patch/config
original patchset