:+1:

I'm leaving this PR open for now but please don't merge this until I've made this change, @macasek.

Thanks.