Revert 61e0b9b..ea92ef2

This rolls back to commit 61e0b9b8e3efd3080da90375bd6f66f1b8cafd39.
Merge branch 'basic-styles'
Revert e9fc6ab..4407f90

This rolls back to commit e9fc6ab520990c5538aa4de74c924012e28cc35f.