Trying 2.8 did break some of my code (as expected from reading the 2.8 beta docs)