reversed nclang modifcations

made our changes via extension methods.