Only applying this for 7.2, because handling this would be ugly under the old retval freeing semantics.