This entire file needs to be reverted after the merge.