Hotfix. Now everything compiles... again!
Sharing commit