Temporary fix for 4.1 breaking surveyor test.

Pull request put in to Surveyor team to fix this.