Revert "Fix border issue with consolidated buffs"

This reverts commit 392279be4549136fcca6065495876303f15120d5.
Fix issue #25: Chatbubbles not getting skinned under a certain condition
Merge http://git.tukui.org/Elv/elvui