shameful 3.6.1 cut because we broke 2.5/3.2 compat