Wip 9661

These changes can't cause issues in a production environment.