Use HintedHandoff to route the key instead of dupliating code