This reverts commit cf7292fcb1. This commit triggered an existing race condition in Google code. More work is needed on the Router to fix this condition before this refactor can land.
cf7292fcb1