nsc: remove that dirty hack - 2