Removing build dependency on http-builder