NOBUG: Fixup commit to fix stuff wrongly changed on merge commits