Revert "[BZ 1070521] Fixed retrieval of OOB datapoints."

The storage queries still don't work as expected.
This is what you get for late night commits.

This reverts the premature commit 6bf49506b834a6bcac699712610b76fdbd4d9e96.