Restore 3h4. Thanks for @KitClement for reporting.