Backporting difficult retargetting for 0.10