This reverts commit a5b5733965. We require the ability to store null values in the map for now
a5b5733965