Revert "Fix zmq/socket stub server usage"

This reverts commit bc07a9aeaf3949c25b6d76b7cda2e87cecea033e.
Revert "Fix the benchmark rake tasks"

This reverts commit c164ef9d89c7eb85303f122d4fd4a3ec4875655d.
Merge branch 'master' into fix_extensions