Reverts #723 & Properly implements infused null check.