Backed out changeset 0aeb846dc2e7 (bug 846340) for causing frequent testMasterPassword failures (bug 915449).