Remove from reporting plugin and put BACK in base.

Allow usage within Edge product!