What even happened? 1.8 changes got reverted...