Revert "Fixed Upstream"

This reverts commit a71737b47b27459c5dd604b332194d17f2d1e15d.
Revert "Remove fontfix.patch from unpack"

This reverts commit 5fce8be84f7dc6a97b2408e991c40cb426fa02c6.