MDL-68661 core_lang: Roll back addresourceoractivity