Undo last change to exclude $StreamModel.java