Ok, removed the last remaining change!