Same bug fix as last check-in, now with less FAIL.