Post 3.4.2 merge cleanup.