Reverting all this crap...