This reverts commit fb41615887b6a92a1bf8d34f5fbe7779b090ec15. Reverting because I over-changed CHANGES.txt white-space.