Spotted from leftovers from my merging clusterfuck

I should've kept it at rebasing...