This reverts commit 33ff46a10e9c9844737990c567ffe497ef2cbd6f. This is being reverted due to many people being unable to start up the QSV encoder with these changes.