Revert "Merge pull request #445 from steveblock/chainedTimingFunctions"

This reverts commit a8a5443f89c32c60970d7424eef220937e1739ec, reversing
changes made to c2b4bb3d4d89cdcedc2874a214420cb402a51734.
Merge pull request #553 from alancutter/revertChainedTimingFunctions

Revert "Merge pull request #445 from steveblock/chainedTimingFunctions"