Revert "Fix NUV playback"

This is not required with 315b354ac, and I'm afraid it could introduce regression.
Better safe than sorry

This reverts commit ba0fc4e29d9d27edc6ad25d16cdf7b799c66548f.

(cherry picked from commit 4a764c3d6fecf7e378318e3e387afaa97215c91e)