MOTM-1042: Undoes some commits that do not belong here