changes of 20131204

removing helios NPE fix which didnt work