Backout 0469cf95fbfe (bug 983571) cause didn't mean to land it yet.