1 files changed, 5 insertions, 0 deletions
diff --git a/regexec.c b/regexec.c
index 50807e47ca..ef5563505f 100644
--- a/regexec.c
+++ b/regexec.c
@@ -994,10 +994,15 @@ Perl_re_intuit_start(pTHX_ REGEXP * const rx, SV *sv, char *strpos,
 	    prog->float_substr = prog->float_utf8 = NULL;	/* clear */
 	    check = NULL;			/* abort */
 	    s = strpos;
+	    /* XXXX If the check string was an implicit check MBOL, then we need to unset the relevent flag
+		    see http://bugs.activestate.com/show_bug.cgi?id=87173 */
+	    if (prog->intflags & PREGf_IMPLICIT)
+		prog->extflags &= ~RXf_ANCH_MBOL;
 	    /* XXXX This is a remnant of the old implementation.  It
 	            looks wasteful, since now INTUIT can use many
 	            other heuristics. */
 	    prog->extflags &= ~RXf_USE_INTUIT;
+	    /* XXXX What other flags might need to be cleared in this branch? */
 	}
 	else
 	    s = strpos;