Back out bug 712939 for not getting fully reviewed.