3 files changed, 7 insertions, 9 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Around.pm b/perllib/FixMyStreet/App/Controller/Around.pm
index b872084ff..44ccb5259 100644
--- a/perllib/FixMyStreet/App/Controller/Around.pm
+++ b/perllib/FixMyStreet/App/Controller/Around.pm
@@ -338,10 +338,8 @@ sub _geocode : Private {
     } else {
         if ( ref($suggestions) eq 'ARRAY' ) {
             foreach (@$suggestions) {
-                my $address = $_->{address};
-                $address = decode_utf8($address) if !utf8::is_utf8($address);
-                push @addresses, $address;
-                push @locations, { address => $address, lat => $_->{latitude}, long => $_->{longitude} };
+                push @addresses, $_->{address};
+                push @locations, { address => $_->{address}, lat => $_->{latitude}, long => $_->{longitude} };
             }
             $response = { suggestions => \@addresses, locations => \@locations };
         } else {
diff --git a/perllib/FixMyStreet/App/Controller/Location.pm b/perllib/FixMyStreet/App/Controller/Location.pm
index c457c8fce..cb2077ede 100644
--- a/perllib/FixMyStreet/App/Controller/Location.pm
+++ b/perllib/FixMyStreet/App/Controller/Location.pm
@@ -96,7 +96,6 @@ sub determine_location_from_pc : Private {
     if ( ref($error) eq 'ARRAY' ) {
         foreach (@$error) {
             my $a = $_->{address};
-            $a = decode_utf8($a) if !utf8::is_utf8($a);
             $a =~ s/, United Kingdom//;
             $a =~ s/, UK//;
             $_->{address} = $a;
diff --git a/perllib/FixMyStreet/Geocode.pm b/perllib/FixMyStreet/Geocode.pm
index b5bb7249c..dd1adfe71 100644
--- a/perllib/FixMyStreet/Geocode.pm
+++ b/perllib/FixMyStreet/Geocode.pm
@@ -73,18 +73,19 @@ sub cache {
     my $cache_file = $cache_dir->child(md5_hex($url));
     my $js;
     if (-s $cache_file && -M $cache_file <= 7 && !FixMyStreet->config('STAGING_SITE')) {
-        $js = $cache_file->slurp;
+        # uncoverable statement
+        $js = $cache_file->slurp_utf8;
     } else {
         $url .= '&' . $args if $args;
         $ua->timeout(15);
         $js = LWP::Simple::get($url);
-        $js = encode_utf8($js) if utf8::is_utf8($js);
         $cache_dir->mkpath;
         if ($js && (!$re || $js !~ $re) && !FixMyStreet->config('STAGING_SITE')) {
-            $cache_file->spew($js);
+            # uncoverable statement
+            $cache_file->spew_utf8($js);
         }
     }
-    $js = JSON->new->utf8->allow_nonref->decode($js) if $js;
+    $js = JSON->new->allow_nonref->decode($js) if $js;
     return $js;
 }