generic/398: remove workarounds for wrong error codes