This replaces the previous work-around and the need of an external compiler. For detailed explanations, see PR 276035. PR: 276035