Tmp fix to mitigate https://github.com/grnet/kamaki/issues/83

We needed this in production ASAP for the CELAR services.