If you're at fixing it, maybe better do it in #879 , so we have a smaller, consistent PR.