-#if defined(LYX_USE_TR1) && defined(LYX_USE_TR1_REGEX)
-# ifdef _MSC_VER
-# include <regex>
-# define match_partial _Match_partial
-# else
-# include <tr1/regex>
-// TODO no match_partial in gcc, how to replace?
-# define match_partial match_default
-# endif
-# define LR_NS std::tr1
-#else
+#ifdef LYX_USE_STD_REGEX
+# include <regex>
+// <regex> in gcc is unusable in versions less than 4.9.0
+// see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631
+# define LR_NS std
+#else