Partially revert previous commit (unused variable that was really used)