Fix merge conflict w/ upstream.

Not sure why this was a thing, must've based off an old pull.