Unbreak find-requires (#443015, #564527)
    - regression originating from commit 9ed9b4e3459e3125befd324f579f751a239c26ca
      which was supposed to fix something for on ARM but broke pretty much
      all else
    - this should've been in 9.1.0 but somehow gone missing, ugh...
    - fix originally from Bill Nottingham