Revert "Merge pull request #20247 from justindarc/bug1014955-v1.4" for gaia-unit test failure

This reverts commit 43da85450074e655b0ee83d3d8d5f4fb6b3c473a, reversing
changes made to 765438e65bc23bbda6c82b4093edcd70eb58e8ad.