Bug 952883 - Backout patch as Bug 936790 is fixed. r=Callek on a CLOSED TREE.