Treat the updater separately

https://www.pivotaltracker.com/story/show/62891390