This is no longer needed with the next commit solving the problem without CPP. This reverts commit b2244101.