let's revert this for now, or make it conditional, or comment that this is a TODO change