diff --git a/headers/private/media/MediaClient.h b/headers/private/media/MediaClient.h
index 411b9fe4cb..9e0f264e34 100755
--- a/headers/private/media/MediaClient.h
+++ b/headers/private/media/MediaClient.h
@@ -154,11 +154,9 @@ public:
 			void					GetLatencyRange(bigtime_t* min,
 										bigtime_t* max) const;
 
-	// When in B_OFFLINE it returns OfflineTime().
-			bigtime_t				OfflineTime() const;
-	// Return the current performance time handled by the object
-	// when run_mode != B_OFFLINE.
-			bigtime_t				PerformanceTime() const;
+	// Return the current performance time handled by the object when
+	// run_mode != B_OFFLINE. Otherwise returns the current offline time.
+			bigtime_t				CurrentTime() const;
 
 	// This is supplied to support using this class in a BMediaAddOn.
 	// Default version just return NULL.
@@ -210,8 +208,7 @@ private:
 			bool					fRunning;
 			BMediaClientNode*		fNode;
 
-			bigtime_t				fPerformanceTime;
-			bigtime_t				fOfflineTime;
+			bigtime_t				fCurrentTime;
 
 			bigtime_t				fMinLatency;
 			bigtime_t				fMaxLatency;
diff --git a/src/kits/media/MediaClient.cpp b/src/kits/media/MediaClient.cpp
index bd7b166d9b..002b836ab0 100755
--- a/src/kits/media/MediaClient.cpp
+++ b/src/kits/media/MediaClient.cpp
@@ -442,20 +442,11 @@ BMediaClient::SetLatencyRange(bigtime_t min, bigtime_t max)
 
 
 bigtime_t
-BMediaClient::OfflineTime() const
+BMediaClient::CurrentTime() const
 {
 	CALLED();
 
-	return fOfflineTime;
-}
-
-
-bigtime_t
-BMediaClient::PerformanceTime() const
-{
-	CALLED();
-
-	return fPerformanceTime;
+	return fCurrentTime;
 }