partial revert of 49755b9fcc5749a8224574dfe8bb76df60021c66

this fixes pickDraw