Simplified impl, removing message and pushing it down to fail-check output.
rename for packaging.