fix package changes in pre-setup state, RT#73377, RT#38404