Use stage & buildpath instead of manually extracting; thanks @mikemcquaid and @adamv.