Revert "Aesthetic client changes"

This reverts commit b23989aa48fc104a9c6ff92356d8ddb942cf390c.