4.3 jitters - Skipped this during 4.3 merge