r12628: Prevent double registration warnings