Normally I'd say yes, but since this is a cherry-pick from a later release I'm more inclined to take it unmodified if possible.