Enable using the system library and falling back to the bundled

We should probably test this somehow...