Rolled back some changesç