Revert "Fix derp"

This reverts commit 93a12f011852865a0e7a825ffcd12c1e6e0ead4b.
Revert "Extended QS Options Rework (1/2)"

This reverts commit 769ba12fbe563180e701f3e9bcfa4bb7b7e07eeb.