Undo error passthrough behavior from 1305283