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

Remove hack for Voldemort Type mangling