argh. i think https://rbcommons.com/s/twitter/r/2937/ is too large to rush to fix before a release. getting up into the 15-20 files and some public interfaces affected range