Revert "Merge branch 'store_findone_fix' into minor"

Fix was based on master. Will have to rebase to minor.

This reverts commit 1d3c85bc8649bf460ae79727fb5c15b09655c4a3, reversing
changes made to e37ac5fa02d7e4465c11105ca16217f751672959.