Do something about #7306