Additional change to 5689604