Fix another merge conflict between commits 5640481 and 5545321
(and clean out some code that is not strictly needed)