[TO_STAGE] workaround for bz969325