Revert internal changes