Remove in #3998 (although @masterbee should keep in mind for downstream)