Clockfix patch rebased on r9288