This reverts commit 5926da56. This commit breaks configuration with a CMake error. Please test your changes before pushing. CCMAIL: butirsky@gmail.com
mentioned in merge request !393 (merged)