Revert "Bug 844575 - [BB][headers] - skin-organic and skin-dark have visual discrepancies"

This reverts commit fe21398cb889d9e4a657b8e908317e9e510bace6.