Revert "Big diff"

This reverts commit bf30db5a4566b7d8c2f7b36cb6aaf3fad34a5d7e.