a09ba8bcc8
Temporary workaround while language and compiler teams sort out handling both modes. Change-Id: I5d676cd546382dba05ec0b62bb885baa854614f6