Partial revert of: Fix a couple open/close bracket sections; the double braces are necessary