Remove silly code that required a MALOC hack-patch and replace it with something that does not.