Pull in fix on handling a return type to un-break the tests.