Fix latest D8 changes. Sigh.