Remove dependency on forestry core (oops)