Revert "Merge pull request #16739 from mcjimenez/bug976951_v2" for gaia-unit test bustage

This reverts commit 61391cd5b77e5085dd1362eee7014c56fefbbdfb, reversing
changes made to 26fa8fe02e656655bc9b89e0c5e74f135965e799.