TMI-57: Clean up after merge.