Move time of of extra

More work towards finishing #8784.