Oops, turned out we needed this still.