Is this change still needed with the new filter and filterNot implementation?