Partial revert of 13026

No match.