(bug 13929) Back out a line that's now obsolete and a line that seems to have been...