...from ab9d657e "INTEGRATION: CWS dba22ui:
acquire in dtor, to prevent reentrance."  Yuck.

Change-Id: Iec5e1fa9d04199a4a1e83c67ed2014299317c5d8