TRUNK-2707: Basic copy and paste job from the Location.java class