[trunk] Add a temporary work around for issue 293