Revert 3706746..9a247be

This rolls back to commit 37067468b92dfad89366e4a8ed82be88e468b57c.
Revert fbb5c20..8ac3080

This rolls back to commit fbb5c20fc68d19ce080951f33dba25b95ed9cefc.
2 reverts: error messages appearing AFTER video complete

This reverts commit 37067468b92dfad89366e4a8ed82be88e468b57c.