Revert "Merge pull request #17023 from pivanov/bug-968483" for gaia-unit test bustage

This reverts commit 32b5a2c8986332d50edde79517fe4fc83ae8519c, reversing
changes made to 6c93da506e79bd7641f2cc0958b531ab84ceefe1.