It would be nice to see this re-usable. I've created #748 to remember to do that.