Revert "C2: error diag"

This reverts commit 19e52e32f1c803ce202e665d1f3571d7be05800c.