revert changes from upstream on qca