Supplemental change for druntime pull 522.