Make this change a little more robust for up-merging.
1 file changed