reverted changes that broke the resize on export
Merge remote-tracking branch 'upstream/master'