Tweaked analytics include to resemble upstream