Backed out changeset 408273e953e9 (bug 886194) for test failures