once https://github.com/scala/scala/pull/5603 is merged as per discussion on that PR