so do we re-add this workaround for now?