Revert "Merge branch 'release-jan-10' into VideoSprint38"

This reverts commit 78e3aa5b63c80f7362252bb849ab63094ffe63d4, reversing
changes made to 8f31500c0f8828109eb647e242bc79406cdc2b1d.