Ported to 1.6 from 1.7 .. Makes sense, right?