Clockfix patch rebased on r9315.