Revert "Massi's fix for Unity case 358526."

This reverts commit 0ded3104efabfa00308524df573a348e383eb540.