Revert "Merge branch 'feature/video' into develop"

This reverts commit 9c0de8220ab1351188a959c99099d2ba97d58257, reversing
changes made to 4e6f4c32fbe4b0dcb7e812d68726413a6ce9422c.