Revert to standard tick ordering, againSigned-off-by: Ross Allan <[email protected]> (commit: dfcb78a)