Revert "Simplify default_sentinel_value"

This reverts commit 4004bd5e3aa11b534903ed824370f1d0b645a17d.