There's actually a package for this so I might switch to that to save having this in our tree.