Revert "TimeLine fixes"

This reverts commit 4b663702d55089383ba3ec395fea9937da8a600c.