Revert "Switching to bucket_location as presence test."

This reverts commit 79443f4f4121490da54ddcdabbea7fbde8d55da0.