ZP-765 Revert the delete of variable as they will used in a near future. Released under the Affero GNU General Public License (AGPL) version 3.