Bug 966560: fix bugs with time skew fix in bug 957863, r=jedp