EDI simplification

Functionally, the only difference is that the last two lines are
horizontally interpolated using bilinear interpolation instead of NN.