Yet another update-induced fix.