Restore delete/rename for popups that function correctly with these included.
Merge