Resubmit for 2.1

Fixes issue #1922