Revert "Merge pull request #3103 from 9rnsr/fix10133"

This reverts commit 2211c8e5b1c7cfb589cec400a959cc672ca92083, reversing
changes made to 8a530b9aa7d10ee0d3e4e9b7d39b366f25438012.
Merge pull request #3151 from 9rnsr/fix11993

[REG] Issue 11993 - typeof(this) in constraint of member function template should reflect method qualifier