Final fix for 2.0, works on mobile now and should be e10s-ready!