Some crap lost in merges and migration