Temporary fix for #4799