Fis broken backport

We must be more careful when backporting now that we have differences between 0.3 and 0.4