Revert "Fix timeline settings for beta"

This didn't work the way I intended.

This reverts commit 9d2430adb546f59bed677fc8e44d472826eb979b.

Change-Id: I5513497ee3991270b152a6b4abd8efb6ec61da0d
Merge "Revert "Fix timeline settings for beta""