Ooops, I forgot to revert those changes before committing.  Just uploaded a commit to revert that.