Re-enable fix for cmake in sdk