Reverting more changes...