Reverted Timewarp fix

Reverted my changes for #41.