Revert 78e5b91 because we are removing the old plugins in #130 and #134