Revert b054aa8; will be reapplied after codebase-wide reindentation

This reverts commit b054aa8d04f06f3fa1cee8a4ded5f4908832ff62.