These initializers are no longer necessary after the upstream fix.