Move from official hint-interpolation branch, to my own fork