Re-rolled patch from #22, removed code from contrib directory. If we want we ...