Remove redifinition of time_base (merge artifact)