Bug 871956 - Fix regression introduced by bug 858416. r=kanru