Add back in our omit null hack