This was fixed with #6838.