We can kill this when you rebase on master (the bug was fixed)