Revert "Merge pull request #17609 from KevinGrandon/bug_985112_marionett...

...e_client_1_1_x"

This reverts commit d19a7fb3efa74c479be7f0b24f030e9895eb4b7a, reversing
changes made to 732a35447c7da220578fc21e10fe119c2552d662.