Why does this function get moved? Even if it should be moved, that should go in a separate pull request as it has no bearing on this functionality.