Recorder doesn't properly extract bodies, backport #1157