Fix non-SUPPORT_MOVE_FROZEN_MESSAGES builds