Reapply 53476 and 53480, with a fix so that it properly updates