Undo 888160f8 because the fix caused the nasty jitters; further investigate required