restored to buffer-scoped mappings