Cherry picked wolfgars commit to fix 1080i playback
Removed unnecessary code