Richard Opalka
committed
on 23 May 12
implement temporary workaround