fixes #250: Revert some changes, because upstream uses another timestamp field