reverted r108850 as patch should be introduced after code freeze