time stamp logic has been reverted back.
Merge pull request #2064 from shivalinga/release-6.6.3.a1

time stamp logic has been reverted back.