Revert "Improved fix on Timestamp issue."

This reverts commit a3009bcb44413ee31822df304367c96d82e236d1.
Revert "Fixes rake "argument out of range" error"

This reverts commit c3e6b03b5abf7025d114f44856fdccf5f51bc990.