Bug 925411 - Temporarily backout patch for bug 868646 for causing this bug. r=spohl