Reverted Timewarp fix

Reverted my changes for #41
Merge pull request #142 from Peppie23/issue-100

Reverted Timewarp fix