This reverts commit 7a6c6897. This breaks the build with cmake 3.13.4, but succeeds with cmake 3.15.3