Temporarily revert if-tag change for another PR upstream.