Clockfix patch rebased on r9310.