remove error recovery and align with upstream/master