Move 7d changes back into the parent

... I hope this is going to go the right way around...