GCP-6555 re-fixed :P