cleanup after S2W cherry-pick