Hopefully this will finally fix the EBS matching issues - I don't know
how I managed to get it quite so wrong last time...