Revert "Merge pull request #20296 from mcjimenez/bug1023142" for gaia-linter bustage

This reverts commit a5913318bfe49f4f077a6a6bbcabf8157584e8b4.