Remove optimization that was required with whiny nils

Whiny nils is no longer a thing, so we no longer need this optimization