Revert "slightly better error messages (without duplicate information)"

This reverts commit a2868fd26d762db63c4b0a6537059a52a3e6bf20.