Revert to commit fd93cb1032b7fd95c244685ef2bdd0c65c28f115 to fix formatting