why is this needed? You said you want to remove it, but why was it added in the first place? What's stopping it from being trivially removed?