Something to file an issue for once this lands