Change nPVR mechanism, exorcise the demon (issue #2707)