Revert "Some changes."

This reverts commit 512ecfe9d577da63396e6b66d285d7fd37ed5b13.