Since we're talking about taking something away, I think it's best to do this one ASAP. Otherwise we end up with a bunch of code that uses it and it gets hard to justify removing it cleanly.