322a8137b2
This reverts commit d788810a05.
We're doing this because it's not necessary. We will be porting to
coros soon and we can just use brace-scopes.