Revert 836a38b..e08678c

This rolls back to commit 836a38b12296c81b3f36a536efcbffd1c5e7d4cb.
looping because of some negative time values - ???