Flux.@functor is broken on 0.15

[mcabbott]

julia> using Flux

julia> struct Layer; stuff; end;

julia> Flux.@functor Layer
┌ Warning: The use of `Flux.@functor` is deprecated.
│ Most likely, you should write `Flux.@layer MyLayer` which will add various convenience methods for your type,
│ such as pretty-printing and use with Adapt.jl.
│ However, this is not required. Flux.jl v0.15 uses Functors.jl v0.5, which makes exploration of most nested `struct`s
│ opt-out instead of opt-in... so Flux will automatically see inside any custom struct definitions.
│ If you really want to apply the `@functor` macro to a custom struct, use `Functors.@functor` instead.
└ @ Flux ~/.julia/packages/Flux/5vIRy/src/deprecations.jl:101
ERROR: UndefVarError: `makefunctor` not defined
Stacktrace:
 [1] top-level scope
   @ REPL[14]:1

[CarloLucibello]

Responsible line

Flux.jl/src/deprecations.jl

Line 109 in 8c60006

return Functors.functorm(args...)

I don't know how to fix this, as I don't know how to have a macro fall back to another macro