I did exactly that in #924