Start fresh on master, only apply needed patches on top now. Upstream commit: 56279fdef34eb28a4655b489b992c651bd8379fc Taken from: FreeBSD