Adapt to the recent changes in the decor/delite infrastructure