Corey, I can't disagree with any of that and its a good catch.  I think if it functionally works, however, it would be better to use the same code as master for now.  My main goal here is to keep more uplifts from breaking v1.2 as we approach release.  We can write a new bug to further refine the regex in master for v1.3.