replace our no_shadow fix with a better patch from upstream (#1118)