Revision r1262 included some changes I didn't intend to commit yet. This reverts...