My own vote would be to use the initial patch (after applying any unrelated changes per later review), ie. add the feature with its disable button.
I can do that, but not if there is a veto from Tom on the feature.I wish definite negative opinions by senior committers would be expressed earlier, so that people do not spend time rewiewing dead code and developing even deader code.
-- Fabien.