This reverts commit bf46ad1a. Conflicts: modules/conop/src/compound.hh modules/conop/src/compound_lib.cc