Revert "Merge branch 'rotating-avatar'"

This reverts commit d40ff898190929bf68ea9edc7dde15ff046a141b, reversing
changes made to 36036b2e3c6fa5285e8762cd30f1f86513120266.
Remove spin from avatar