Bug 955870 - Backout unwanted part of patch r=me