Fix rooting hazards from 4fbe5c6db773 (Bug 990475).