Switch to using external lib