Merge "Make Remove() atomic, as expected"