Refactor change for backward-compatibility.