Issue 12352 - Consistently stop encoding return type of parent functions

https://d.puremagic.com/issues/show_bug.cgi?id=12352

Remove hack for Voldemort Type mangling