Revert "Ensure that Option.Some can never be null"

This reverts commit 378938ff48eb71812f036ac57b626f7b4ed09894.