Remove remap_env_constness in queries
#109665
Merged
remap_env_constness in queries
#109665