Revert "Bugfix for DVR-MS files"

This reverts commit c2d4de14428c0b5f05bc2bff5ac99cfc90275502.