Bug 859257 - Backout original fix 4c0d13ce4c4a since ab6e995676bd has superseded it