Backout rev eedf61cab3fa (bug 643325) for test failures