Will no longer be necessary since tree support is being removed (for now at least).