WP-4611: Move old variable to correct location.