Revert "optimize the null cursor"

This reverts commit a163137537e9e3673f1886ab0a9f45959cb13883.