Up to 3.10.0, magic patch not needed (fixed upstream)