This reverts commit 342932fa. Overlap checker tests failed, and blocker overlaps are discussed in computing/cbmroot!1986