Reapplying r136844.