It makes sense to push this upstream.