Seems I can't build with 86a1471d7cde792941109b93b558b5dc078b9ee9 applied so easily as it depends on definitions from other patches.