generic/395: remove workarounds for wrong error codes