Wasn't this originally my patch?  Not that I really care for this
trivial move, but the commit log just sounded familar.