Changes in this file look like they are unrelated to the title stuff.  Can the kit saving fixes be pulled out into a separate pull request please?  `git add --patch` or `git add -i` might be your friend here!