Revert the mistaken revert(?) and add clock trim