Revert back to using --without=