r5663: Revert some changes I didn't mean to commit...