Revert include to upstream form