DO NOT MERGE - FOR INTERNAL CODE REVIEW ONLY

Why the braces here?