Temporarily reverting r99863 to see if I can pin down test failures