Reverting some strange changes