Reverting r221626 due to a too-strict test.