Are there any functional changes here? If not, please revert them out, it's just confusing.