splitting this off from as a post-release to-do item, from https://github.com/scala/scala/pull/9078