Reverting some of the changes in r14835, per http://mail.wikipedia.org/pipermail...