Re-add Unbound to build for v2.2 (#3396)