fix Issue 12352 - Consistently stop encoding return type of parent functions

Remove hack for Voldemort Type mangling
Merge pull request #3377 from 9rnsr/fix12352

Issue 12352 - Consistently stop encoding return type of parent functions