This change a bit the logic introduced on rBcc7460eaa491.
Since this was originally introduced to handle multi-object, it should
be fine to bypass it for the active object.
@Campbell Barton (campbellbarton) I'm not sure how to reproduce the unreported bug fixed on rBcc7460eaa491, so I could use your help here to test this patch.
Looking into this more, think it's best to split out logic for multi-edit mode and other modes that don't support it.
Applied alternate fixes: