I'll push this under the assumption that it's OK (and with jsirois' shipit), can always change/revert if needed.