More repairing reverted changes