I think this is issue #1600 ... I tried fixing it and ran into some strange test failures and haven't gotten back to it yet.