Restoring workaround for ESP8266