Revert "Merge pull request #48 from jfkthame/fira-3.108-hacked"

This reverts commit ea7de9e259c249372cb7b3dc905e5fcaffba64a7, reversing
changes made to 08b7f6a625f23e48a9cb0c8f63ee131009754f7c.