Revert "Revert "Switching to bucket_location as presence test.""

This reverts commit 4d4d55fdb4598386745a363ae66bdbedf9818649.