Revert "Merge pull request #16895 from shamenchens/B935859"

This reverts commit a37eebd5f911c54eaa67613f70de2b8fc66109be, reversing
changes made to e2038e3c4a29b892804bae90fbc99971a0da03c7.
Merge pull request #17011 from gasolin/backout-935859

Revert "Merge pull request #16895 from shamenchens/B935859", make marionette test pass