Clockfix patch rebased on r9306.