Move time out of extra (cc #8784)