Temporary fix until in mainline dependency