This makes 2nd-order orientation functions work again.