Added back in compiler-plugin 3.1