Reverting unintentionally committed OKFN plugout changes (see okfn-recatoring branch)