Reverts commit 71d9e90. This returns the commands back to a regex based solution.