Re-add separate var statements post-revert