removed fixmes for the wifi workaround