They probably won't since they've already started switching their bigger dies to polymer TIM.
For the overwhelming majority of their customers they only need the polymer TIM to ensure proper thermal conductivity at stock speeds, enthusiasts who will push the chips to the point where the polymer TIM becomes an issue are just an insignificant % of the market for them.
Intel's materials science engineers have a few papers
like this one published which point out the issues with using indium-solder as TIM, namely reliability after intensive thermal cycling, the indium-solder will develop various defects that can even damage the die. Polymer on the other hand has much better long term reliability but at the cost of significantly worse thermal conductivity, indium solder has a thermal conductivity of around 80 W/(m-K) while the polymer TIM they use is at 6~8 W/(m-K).
Not to mention the process of actually soldering a silicon die to a nickel plated copper heat spreader isn't easy or gentle on die. The whole process would need temperatures up to 170 C and this is how many layers you'd need:
As their process gets denser (they market their 10nm as reaching 100 million transistors per sq. mm), it's quite possible soldering the die becomes unfeasible. More sensitive dies would just get destroyed in packaging, so from their point of view they have a cheaper alternative to soldering the chips that won't have a negative impact in packaging but with the cost of much lower thermal conductivity. As long as the chips run to spec, it doesn't really matter to them much and they can probably save a bit of money.
Additionally a thin enough polymer TIM layer can perform similarly to a thicker indium-solder sheet and it's quite possible that at one point they'll get there with their packaging. der8auer has a
video where he delids and removes the indium solder sheet from a 6950X and you can see he gets a pretty hefty temperature decrease after he replaces the thick solder sheet with liquid metal.
So we probably won't ever see solder anymore for any of Intel's consumer dies, best get used to delidding.
I'm not sure about AMD, but they'll probably get there at one point once they start using denser processes (GloFo/Samsung's 14nm is closer to Intel's 22nm density wise), or they won't and will keep soldered dies as an advantage.