Revert "code causing null check"

This reverts commit c03979651e63275299c5d9204ac9acae17a99bcf.