Adding workaround till GEOSPHERE issue is fixed.