Revert "Display None"

This reverts commit 7877804c209b299c8e83b1c0a56e06aae740ba19.