Revert changes to video group index unset code

I'm guessing this change was made to cleanup the code, however it is not functionally identical and may cause issues. Revert until those can be discussed.