(sergebar) Implementing the correct scheduler behavior in TimeSource