These will be replaced soon (or in modules.org case, they already have, in 2636fbc). Ref: 2636fbc36f54