Okay... This fixes A LOT!

Sorry for the breaking of the repository - This overwrites any changes
made by another computer of mine.