nsc: remove that dirty hack