diff --git a/intern/cycles/kernel/shaders/node_combine_hsv.osl b/intern/cycles/kernel/shaders/node_combine_hsv.osl
index 8b3c3f0e839..6b922bf4e6b 100644
--- a/intern/cycles/kernel/shaders/node_combine_hsv.osl
+++ b/intern/cycles/kernel/shaders/node_combine_hsv.osl
@@ -15,7 +15,6 @@
  */
 
 #include "stdosl.h"
-#include "node_color.h"
 
 shader node_combine_hsv(
 	float H = 0.0,
@@ -23,6 +22,6 @@ shader node_combine_hsv(
 	float V = 0.0,
 	output color Color = 0.8)
 {
-	Color = color_srgb_to_scene_linear(color("hsv", H, S, V));
+	Color = color("hsv", H, S, V);	
 }
 
diff --git a/intern/cycles/kernel/shaders/node_separate_hsv.osl b/intern/cycles/kernel/shaders/node_separate_hsv.osl
index 7eb58caa99d..2a804040294 100644
--- a/intern/cycles/kernel/shaders/node_separate_hsv.osl
+++ b/intern/cycles/kernel/shaders/node_separate_hsv.osl
@@ -23,7 +23,7 @@ shader node_separate_hsv(
 	output float S = 0.0,
 	output float V = 0.0)
 {
-	color col = rgb_to_hsv(color_scene_linear_to_srgb(Color));
+	color col = rgb_to_hsv(Color);
 	
 	H = col[0];
 	S = col[1];
diff --git a/intern/cycles/kernel/svm/svm_sepcomb_hsv.h b/intern/cycles/kernel/svm/svm_sepcomb_hsv.h
index 5a48bbe56e7..68f9fea02f0 100644
--- a/intern/cycles/kernel/svm/svm_sepcomb_hsv.h
+++ b/intern/cycles/kernel/svm/svm_sepcomb_hsv.h
@@ -26,8 +26,7 @@ ccl_device void svm_node_combine_hsv(KernelGlobals *kg, ShaderData *sd, float *s
 	float value = stack_load_float(stack, value_in);
 	
 	/* Combine, and convert back to RGB */
-	float3 color = color_srgb_to_scene_linear(
-	        hsv_to_rgb(make_float3(hue, saturation, value)));
+	float3 color = hsv_to_rgb(make_float3(hue, saturation, value));
 
 	if (stack_valid(color_out))
 		stack_store_float3(stack, color_out, color);
@@ -41,7 +40,7 @@ ccl_device void svm_node_separate_hsv(KernelGlobals *kg, ShaderData *sd, float *
 	float3 color = stack_load_float3(stack, color_in);
 	
 	/* Convert to HSV */
-	color = rgb_to_hsv(color_scene_linear_to_srgb(color));
+	color = rgb_to_hsv(color);
 
 	if (stack_valid(hue_out))
 		stack_store_float(stack, hue_out, color.x);