DayDreamized: please cherry-pick this commit when resetting manifest