Revert "AppBar fixes"

This reverts commit d2f6cdf9d8c1e120b4a0d459da0080d4f2077989.