The build failure should be fixed by de681d53. Follow-up refactor will be done in future patches. This reverts commit e7c5ced0.