Fixed Netflix compat.
Revert "Fixed Netflix compat."

This reverts commit 3e3d91427e7d983c974118adfc0acc17c53d35bd.
Merge branch 'master' into release
Merge branch 'master' into release
Merge branch 'master' into release
Merge branch 'master' into release
Merge branch 'master' into release