Revert "Merge pull request #17494 from gasolin/sheriff971554" for gaia-unit failures

This reverts commit c377f41d017d4b099e92fd7ecf67d9cd1cee1292, reversing
changes made to 3286e2a0cbcac52e38c0494ab614bac23cdc229f.