Whoops good point! I have a feeling that will land before this, and I'll rebase it back in at that time (it should definitely stick around now that we have an implementation).