Switching to bucket_location as presence test.