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
........

Merged revisions 401895 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 401896 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 401897 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: http://svn.asterisk.org/svn/asterisk/trunk@401898 f38db490-d61c-443f-a65b-d21fe96a405b