£4bn Navy deal back on course