CRM-14466 made changes to how variables are initialized