Backed out changeset 0eb72829d870 (bug 1813299) for causing failures on test_basic...