It now sets the gateway key for bug #8189.