Well... Except that that logic only works if you've got the changes from my branch.

Sadly, whether you need to change this or not depends on whether you merge first or whether #945 does.