Disable capability stuff for now.
Re-add mysteriously disappearing code from merge.