Remove modifications under test done with 546357811fad331205dd4704f542aa8b7e34ce8a