Undoing this to see if it makes a difference to non-multisite tests