Just a quick update. For an upgrade-proof workaround, just save the entire contents of the file I posted earlier in this thread to your theme and use require_once within your functions.php file.
require_once 'class-acf-location-post-template.php
It will override the built in one and provide the fix.
