totally ripped out 1.5.2 compat