Revert timing change #3431

The docs are aweful confusing, but it does look like this needs to be converted
Merge pull request #4220 from jacksontj/develop

Revert timing change #3431