Correct failed merge

For some reason the merge fc52af95ddfe1a2c867263d9fc2ffebce8c4effe did
not merge the changes.