cc @drq

@kafazen