Revert the deletion of marking (deleted) maps as unreadable.

This causes other errors, so I have to come up with a better
targeted fix (if possible).

Bug: 26807329
Bug: 27152097
Change-Id: I110a00406fa63419cfeb555902279aa227d86c6d