Re-add non-fake data calls.
Commit the rest of unchanged files.