it occurred to me that there was an interleaving in which my previous workaround would fail...this should fix it
Authored by: wdforson 2012-03-31
Parent: [r5508]
Child: [r5510]
