remove yield from defer.returnValue calls