Revert "Replace missing question mark in regex for advocacy...i suck at regex.  Fix bug 1068931"

This reverts commit 69d490f9bf5bc8202f3f93fd8c4dfd066d2b44a1.
Revert "fix bug 1068931"

This reverts commit ea36a0d4881564034421824dc7db8879b54bee35.
Revert "Redirect for advocacy"

This reverts commit 658cf1efb7bda779e4093022d929bba35efdf147.
Fix bug 1068931