Revert "stop using a sentinel, just use null"

This reverts commit d4176b3197d7776cfbd0606f5765970111cca4a7.