Another approach to make 1.8 behave like 1.9