Really fixing bug 3159 this time.