Clean up minor merge conflict from 3.8.x