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

(cherry picked from commit bd862dec)

Change-Id: If293941364d500b8fa61397d869eeabaed0cd26b