Revert "Another one bite to... clocks"

This reverts commit 2b4f402b6f808ed0234a8672c81920a124df713f.