Fixed issue NPTS-43. Basically revert the change made in 8f351cf.