merge thautas serial clocks fix and revert my hacky workaround