We should move the functions back where they were to avoid such drastic diffs.