This reverts commit e2a885537f. Build failures were fixed right away and reverting the original commit without the fixes breaks the build again.
This reverts commit e2a885537f. Build failures were fixed right away and reverting the original commit without the fixes breaks the build again.