Revert "Use a fixed regex for StripState"

Breaks extensions, doesn't entirely fix the problem it was meant to fix.

This reverts commit 6da3f169ac55ae87837a4ba3cf3e30f83fbf9d7d.

Change-Id: Ic193abcff8c72b0c8b434fcac514f88603a45beb