Revert "ignore null values when setting options"

This reverts commit 8b30bc222a77665152763b2b00d294a04664ac50.