backout 3d0d92f2406b for not working properly
merge fx-team  to mozilla-central