Clockfix patch rebased on r9346.