Try to dup code and remove poller references to capsd.  Update features
to get further deployment.