Revert "Merged files from upstream"

This reverts commit 27addbb7d316d4cce52c3f96ad733deb70a523b8.