diff --git a/lib/MySQL_Thread.cpp b/lib/MySQL_Thread.cpp
index 5d6e470be..fec4d366b 100644
--- a/lib/MySQL_Thread.cpp
+++ b/lib/MySQL_Thread.cpp
@@ -1141,8 +1141,7 @@ MySQL_Threads_Handler::MySQL_Threads_Handler() {
 	variables.query_processor_iterations=0;
 	variables.query_processor_regex=1;
 	variables.set_query_lock_on_hostgroup=1;
-	// FIXME: this must become 2 in 2.6.0
-	variables.set_parser_algorithm=1; // before 2.6.0 this was 1 , must become 2
+	variables.set_parser_algorithm=2; // before 2.6.0 this was 1
 	variables.reset_connection_algorithm=2;
 	variables.auto_increment_delay_multiplex=5;
 	variables.auto_increment_delay_multiplex_timeout_ms=10000;