temporarily reverting part of r36598

No match.