avoids a more complex regex with branches, and doesn't duplicate the
execution block

Change-Id: I48550c7ea2938001c139b9baecd1282727d7db31