Reversing last commits

Something weird happened, starting with the last working commit.