Go back to laborious top down for now, see what needs changing for 7.8.x