remove override for always locating elements
Merge branch 'always_locate' into bst_tests