Merge "Remove incorrect (and unused) capget code."