CORE-5775: fixed some problems with a merge that I botched