Reverting back to the pre-Entypo state

I don't like the current setup with Entypo, so I'm reverting back to
the state at acf5df2.