Revert "Issue #2614720 by quietone, roderik, Dylan Donkersgoed, ofry, Deepak Goyal, samiullah, jonathanshaw, benjifisher, catch, larowlan, Ruedische, Rewted, KlemenDEV, ao2, abramm, vadim.hirbu, HiMyNameIsSeb, dionsj, xjm, mgp_novicell, scalas89, rollins, dmytro-aragorn, hchonov, mayurjadhav, paranojik, nplowman: Fatal errors while loading/building orphaned comments"

This reverts commit 0130f6d0.