A patch was added to revert upstream commit e8b45cc8. This upstream commit was causing numererous build failures.