Attempt 2 to make this auto-merge.