Fix time-context headers so you do not need a reboot