revert clicompat-r2.patch from r401704

Patch caused the following build errors against testsuite
https://bamboo.asterisk.org/bamboo/browse/AST-ATRUNKBUILD4-244

(issue ASTERISK-22467)
Reported by: Corey Farrell


git-svn-id: http://svn.asterisk.org/svn/asterisk/branches/1.8@401895 f38db490-d61c-443f-a65b-d21fe96a405b