Revert my previous patch. The cmake build had already been fixed.