Fixes #2566.
Merge pull request #2584 from Petethegoat/oops

No more huge armbands. Fixes #2566.