Merge "Fix time's conditional use of global_core to find its offset"