Removing Servspec workaround, not necessary anymore