Restoring some semblance of my original formatting, take it easy with that auto-formatter folks!
Backing out a test breaking change inadvertently made during formatting.