Reverting PR #874 - we don't touch any existing classes which begin `no-` (except `no-js`)
Merge pull request #1122 from stucox/revert874

Reverting PR #874