revert-3028-cbrd-24054 Revert "constant query caused segfault when separating multi…
This reverts commit e708a041de742501de2039b113851ee95e0b4400.
AMD64
C++
Git
CC=gcc-8 CXX=g++-8