Remove special return-code handling for charm-proof