Revert "Guard against nills"

This reverts commit c1747c9797a510428d05bb67ab62f365a72a12cc.