Ensure refactor doesn't introduce any BC.

Signed-off-by: crynobone <crynobone@gmail.com>