Reverting PR #874

We don't touch any existing classes which begin `no-` (except `no-js`).

See #808 for full discussion.