Put clicompat-r2.patch back in