morebits: grab basetimestamp on reverting
Merge pull request #193 from jimmyxu/for-azatoth

morebits: use correct value for basetimestamp
Merge remote-tracking branch 'azatoth/master'