Revert 46d09e3..c5d7d1d

This rolls back to commit 46d09e3dd4583fb0f74a1f488bcca336a95ededd.
shorten error message