Ported support for nosuffix from master to 1.6.x.