Stuff for scratchbuilds, revert before merge