Revert includes that were accidentally changed with another pull request