MAP-872: Fix due to problem with git conflict resolution.