Reverted some upstream Linux changes