Revert "Switched to Simple Router for regex routing"

This reverts commit 9841c81c55c554fea3a770f512803fd72c4df17b.