This reverts commit 7bc7fe6b. The immediate callers have been fixed to pass nullopt where appropriate.