Change 'NO_JSON' to lowercase.  Remove other branch changes that are now superfluous.