Revert "Added files from master"

This reverts commit 40adb29c36787d7266f32f990d685f1898824b6c, reversing
changes made to d623a884828d1c7fadf3b7067794d5f2172524d1.