pull in some armor stuff from 1.6