Bug 1552: revert https://bugzil.la/951618
Bug 1541 - Compatible with Fx31