Move time out of extra

More work towards finishing #8784.