Switch to using os:timestamp in the cs driver