This reverts commit b04076b357. Working around database inconsistency is not a solution, idiot.
b04076b357