revert all
make patching universal