Revert "AHI: Fix up the detected libraries"