As per recent discussions regards remnant code using FilterDesktop and alike, which we want to get rid of.
CC @pkoppenb and @dfazzini.