Cleaned up errant merge.