Fixed in another issue, so no more needed after rebase :)