Revert new broken check from commit b0a73746c, and even remove initial a6eabc004 (r73394) useless check.
b0a73746c
a6eabc004