Reverting some hate stuff so things work again