Something got very messed up somewhere, but this should fix things from here on out.