Hidendra merged my patch! Let's use that!