Yep, that's what I've done (see the non-outdated diff).