Remove experimental interchange hack