Merge "Revert "Introduce RoughtimeClient""