Bug 7769 - Master branch is broken because of the test failures.