Issue #3943: Removal map method