Bug 840526 - Front-end workaround for bug 839974. r=fryn