Revert "Put changes back."

This reverts commit cbfe589a2ec6c7290e4e92fd445e8bd170867db5.