Right now filter is not getting used anywhere. Isn't it better to bring it back when we actually need? 
Just for fixing the bug we need one line change in SystemSplitManager as well.