Revert "Merge branch 'stieg_predictive_timer'"

This reverts commit 28118c7281e0126b95e351a737314ac14c3a2c5f, reversing
changes made to 0510ea83bfffbed23befd57c0b27d93de650a403.

Effectively this pulls out the predictive timer code until we are
in steady state again.