Speculatively untag from merge of #2273.  Fixes #2153.