Merge "Do not clear exiting flag following explicit remove."