Revert "Merge branch '297379-experiment-recording-and-control-experiment-bug-investigation' into 'master'"

This reverts merge request !51468