Revert "Merge pull request #17128 from vingtetun/bug977680" for gaia-unit bustage

This reverts commit 6a70c1909a04f25f370502aebc7b6acfdf6e7c72, reversing
changes made to 0bd8cd3ec44de6289da066685e1a2aed805deb91.