HIVE-8793: revert change to nullscan