This should be fixed by a317859