Breaks the build. I applied wrong patch? This reverts commit a9a56ad508fa67d006df7a3b868cece04e10fc2b.