Bug 902783 - Fx24 Beta: back out Bug 866957 and Bug 877725 r=blassey r=liuche a=lsblakk