Revert "Temporarily delete all for merging from gone-gone branch."

This reverts commit 8e6a737ee41f7a8d39d2952938a22b21730bfda6.