Revert "Merge pull request #12717 from punamdahiya/Bug924170_Video_Marionette_Tests"

This reverts commit 7deffe21aedd0b1908d981be4a348f148a4332e8, reversing
changes made to 1f275beb53779feb31e1b00611c5e85428c431ae.
Merge pull request #14738 from gregorwagner/back

Revert "Merge pull request #12717 from punamdahiya/Bug924170_Video_Mario...