Revert "Merge pull request #17466 from marshall/ftuPing" for breaking gaia-unit tests on TBPL

This reverts commit 732a35447c7da220578fc21e10fe119c2552d662, reversing
changes made to 2f48cfaf3dcc1732c57dbc0706819e9359d79fce.