Code move, no functional change