Fix for timestamp losing nano second precision. Making it work for timestamp arithmetic too
Removing the commented code