Note the options are still there, they just don't work anymore because we don't have non-regression tests for that.