Compiler: partial revert of d07f9d1