I guess this code will disappear from this PR's diff after we merge the other one...