Bug 931891 - [Holly] Backed out bug 887515 and the followups (bug 896291, 909662, 896896). r=ttaubert