Revert "Temporary fix for a compiler issue (2356634)."

This reverts commit f25ebd0f5ce1df849b850c79a95de370aaa326c6.

A new compiler has been checked in which fixes the underlying issue.
1 file changed