This is needed because we want the compiler code to stay as much the same in master and in 1.2 as possible