Workaround for TRUNK-3751